Revert 2b12183..e87b7d9

This rolls back to commit 2b12183c83473c659f7c1c5006c0df82b3292610.