Revert dd63e61..a173459

This rolls back to commit dd63e6145b167d3336733d46c4b4130b2c09de9b.