Revert 6fa01b3..107cb7e

This rolls back to commit 6fa01b3e24061737e27fb0aafbb12488411ff8b5.