Revert 5a3e4b6..13ed1cd

This rolls back to commit 5a3e4b6db553f91e2f1ed80fa39c64083fd2f281.