Revert "REVERT THIS BEFORE MERGING!"

This reverts commit d2bc780b66fcdb58919000e1557104cfb6de47b1.