Revert bd83fd4..1647f05

This rolls back to commit bd83fd4c283ffc9c34eb2b5107befa07bdf10fc6.