Revert 89b61bc..8927321

This rolls back to commit 89b61bc54cd2cb56bdab460c5a65c243af064ebe.