Revert 00228ab..261a47c

This rolls back to commit 00228ab70ca30318eb50a7e8a04b409a6937d1b9.