Revert 2a15287..2269967

This rolls back to commit 2a15287e07890958a9f8158158e5b63e41d6e6dd.