Revert 4e6c12d..c548ed8

This rolls back to commit 4e6c12d9954c24b5f8e61e6e4e9df0558c80e717.