Revert 4bbc3a4..cf894ac

This rolls back to commit 4bbc3a465e3e75a8b8605e79c6335eb012d0a039.