Revert 3105bea..f06a14e

This rolls back to commit 3105bea14c410108bff11797b3ee0d1058812eec.