Merge pull request #3159 from cgwalters/revert-bootprefix #1916

Job	Run time
build-no-features	1m 36s
build-git-libostree	3m 33s
build	2m 4s
Build, minimum supported toolchain (MSRV)	1m 33s
cargo-deny	20s
	9m 6s

Provide feedback