Revert 7cb4c48..25a3527

This rolls back to commit 7cb4c4820aa7204519ab22e97f3af3f513b49d50.