Revert 614109b..46288cd

This rolls back to commit 614109bcda525e4c0ad5a18f23f64ab68e09bcb7.