Revert f50de0d..3a5805d

This rolls back to commit f50de0d7b9afa2be4cdc7815f3576386d4cbde75.