Revert 15632ee..b108e04

This rolls back to commit 15632eee9581ab34c64a34f8285ae89ecfc82744.