Revert 31febb4..61c815b

This rolls back to commit 31febb493dc0edebf75a8380ed1be88b46864787.