Revert ae690f5..cf3b406

This rolls back to commit ae690f53962615a7a4e601fd9d474eee971b3e0f.
Revert 6c8be49..7b84fec

This rolls back to commit 6c8be49491c648ef51eeeb38dcbb6d5873f43c7f.