Revert 5e39755..acc27c5

This rolls back to commit 5e39755649ee4fabeea241e79f9d4a2e9a055d22.