Revert 59e4edb..4a012a6

This rolls back to commit 59e4edb364701d976f2adba9e9cfe8e12fd9cd94.