Revert 619ce85..0af1113

This rolls back to commit 619ce85c45458b29e85a2fcd7b1c4146fffcc502.