Revert 2fc00a3..be5fbf6

This rolls back to commit 2fc00a3faa4187123a1788b634319e52c1e3d0d2.