Revert 2d0d163..b42d844

This rolls back to commit 2d0d163ea51bf5f5545ee8f6f511ac8096c58e57.