I hate this so much

This rolls back to commit 80b71f212c90972df9e4decaf14456d574fd1eaa.