Revert 6f83d50..a544e39

This rolls back to commit 6f83d5004fd173aafa89ec294ef4045abc6b6d80.