Revert 530cd0f..58cf5ee

This rolls back to commit 530cd0fabd727d0c079bb33811899b910d7d631f.