Revert 21e1bf1..e54c5f5

This rolls back to commit 21e1bf199a50632f2001f79e10433527fbd8edfe.