Revert 2cccd59..224481e

This rolls back to commit 2cccd596ba4830941b0e00382330ac4446932394.
Lost.