Revert "Broken commit, will roll back"

This reverts commit 1bf9430333b2b58267b5a91663c23ca3f6514625.