Revert 3fae855..3842331

This rolls back to commit 3fae85529f6068c5f943e70925780d750e46acce.