Revert 4d930e1..8fe68d2

This rolls back to commit 4d930e1612cb7518385530cfe6596bc698ff523a.