Revert 8bc8421..e4aacce

This rolls back to commit 8bc8421d329cd770392e308fe98f336b96773463.