Revert 6fdb73c..a6c4ab4

This rolls back to commit 6fdb73c915a52b0b06d7976da050117912ba8cf9.