Revert 87ea1e0..46dfe4e

This rolls back to commit 87ea1e0b6374f7d0ce24f02b0f75c0f8fc6b5104.