Revert 42b4d04..b0a8b3c

This rolls back to commit 42b4d041a3f986620c4575e65d248d57fbf8ab34.