Revert 7dccf2a..d12f1d4

This rolls back to commit 7dccf2a342f4862498bd194d4de565f0c7035ef1.